librarian-puppet 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08c75cdf58e714613049fb02086e3e2c52d60629
-  data.tar.gz: e8f412a27a19726bdfe206a3aa77f6feae39f75c
+  metadata.gz: dec4cc59a2c57a5139ded1012aba17a43754bce8
+  data.tar.gz: f93343ec556afd556e21c33ceed2258cd4fa67ba
 SHA512:
-  metadata.gz: 1e9c76e105356651bc861de1fa816e2e3c1772df3c953c7e0d6f0f90f3c6bd20ecde8aa3e7086f47ebb9a8a44d991b2bc475d4488a49d9b841e705308f2e523d
-  data.tar.gz: fc9708a059e1ea06bd5a6d9d6a2703a8f4f4b388aa32de2165de3b89aea99867b9771200c5ab68c07bae18257259a83867d2896db2feae91f03c947ee231f139
+  metadata.gz: 38d1da1a402eaf543f848d0bd9dcc351815f0a40085c1210a3a9d94dab1fc22235d821135087d1c2dc127e396bb30782b0a9d82699e4794b72a0bd77684d118b
+  data.tar.gz: fab30de03b221891662376c9189c41d1d8ff257f75adee91954f4b5b327d11fd7a1a3123ecbaf59a7cc0320281f15928b60efacdc2eee8cd4d90000c5e1f9e5f

data/README.md

@@ -9,7 +9,7 @@ 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 a just a path.
 
-* Librarian-puppet can reuse the dependencies listed in your `Modulefile` or `metadata.json`
+* Librarian-puppet can reuse the dependencies listed in your Modulefile
 * 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
@@ -28,52 +28,42 @@ It is based on [Librarian](https://github.com/applicationsonline/librarian), a
 framework for writing bundlers, which are tools that resolve, fetch, install,
 and isolate a project's dependencies.
 
-## Versions
-
-Librarian-puppet >= 1.1.0 requires Ruby 1.9 and uses the Puppet Forge API v3.
-Versions < 1.1.0 works on Ruby 1.8.
-
-See the [Changelog](Changelog.md) for more details.
-
 ## The Puppetfile
 
-Every Puppet repository that uses Librarian-puppet may have a file named
-`Puppetfile`, `metadata.json` or `Modulefile` in the root directory of that repository.
-The full specification
-for which modules your puppet infrastructure repository depends goes in here.
+Every Puppet repository that uses Librarian-puppet will have a file named
+`Puppetfile` in the root directory of that repository.  The full specification
+for which modules your puppet infrastructure repository  depends goes in here.
 
-### Simple usage
+### Simple Puppetfile
 
-If no Puppetfile is present, `librarian-puppet` will download all the dependencies
-listed in your `metadata.json` or `Modulefile` from the Puppet Forge,
-as if the Puppetfile contained
+This Puppetfile will download all the dependencies listed in your Modulefile from the Puppet Forge
 
-    forge "https://forgeapi.puppetlabs.com"
+    forge "https://forge.puppetlabs.com"
 
-    metadata
+    modulefile
 
 
 ### Example Puppetfile
 
     forge "https://forge.puppetlabs.com"
 
-    mod 'puppetlabs-razor'
-    mod 'puppetlabs-ntp', "0.0.3"
+    mod "puppetlabs/razor"
+    mod "puppetlabs/ntp", "0.0.3"
 
-    mod 'puppetlabs-apt',
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git"
 
-    mod 'puppetlabs-stdlib',
+    mod "puppetlabs/stdlib",
       :git => "git://github.com/puppetlabs/puppetlabs-stdlib.git"
 
-    mod 'puppetlabs-apache', '0.6.0',
+    mod 'puppetlabs/apache', '0.6.0',
       :github_tarball => 'puppetlabs/puppetlabs-apache'
 
 
 ### Recursive module dependency resolution
 
 When fetching a module all dependencies specified in its
-`Modulefile`, `metadata.json` and `Puppetfile` will be resolved and installed.
+`Modulefile` and `Puppetfile` will be resolved and installed.
 
 ### Puppetfile Breakdown
 
@@ -83,29 +73,29 @@ This declares that we want to use the official Puppet Labs Forge as our default
 source when pulling down modules.  If you run your own local forge, you may
 want to change this.
 
-    mod 'puppetlabs-razor'
+    mod "puppetlabs/razor"
 
 Pull in the latest version of the Puppet Labs Razor module from the default
 source.
 
-    mod 'puppetlabs-ntp', "0.0.3"
+    mod "puppetlabs/ntp", "0.0.3"
 
 Pull in version 0.0.3 of the Puppet Labs NTP module from the default source.
 
-    mod 'puppetlabs-apt',
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git"
 
 Our puppet infrastructure repository depends on the `apt` module from the
 Puppet Labs GitHub repos and checks out the `master` branch.
 
-    mod 'puppetlabs-apt',
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git",
       :ref => '0.0.3'
 
 Our puppet infrastructure repository depends on the `apt` module from the
 Puppet Labs GitHub repos and checks out a tag of `0.0.3`.
 
-    mod 'puppetlabs-apt',
+    mod "puppetlabs/apt",
       :git => "git://github.com/puppetlabs/puppetlabs-apt.git",
       :ref => 'feature/master/dans_refactor'
 
@@ -127,7 +117,7 @@ with many modules in it. If we need a module from such a repository, we can
 use the `:path =>` option here to help Librarian-puppet drill down and find the
 module subdirectory.
 
-    mod 'puppetlabs-apt',
+    mod "puppetlabs/apt",
       :git => "git://github.com/fake/puppet-modules.git",
       :path => "modules/apt"
 
@@ -164,14 +154,6 @@ source specified.  This command writes the complete resolution into
 `Puppetfile.lock` and then copies all of the fetched modules into your
 `modules/` directory, overwriting whatever was there before.
 
-Librarian-puppet support both v1 and v3 of the Puppet Forge API.
-Specify a specific API version when installing modules:
-
-    $ librarian-puppet install --use-v1-api # this is default
-    $ librarian-puppet install --no-use-v1-api # use the v3 API
-
-Please note that this does not apply for the official Puppet Forge where v3 is used by default.
-
 Get an overview of your `Puppetfile.lock` with:
 
     $ librarian-puppet show

data/lib/librarian/puppet/cli.rb

@@ -2,7 +2,6 @@ require 'librarian/helpers'
 
 require 'librarian/cli'
 require 'librarian/puppet'
-require 'librarian/puppet/action'
 
 module Librarian
   module Puppet
@@ -45,9 +44,13 @@ module Librarian
       option "path", :type => :string
       option "destructive", :type => :boolean, :default => false
       option "local", :type => :boolean, :default => false
-      option "use-v1-api", :type => :boolean, :default => true
       def install
 
+        unless File.exist?('Puppetfile')
+          say "Could not find Puppetfile in #{Dir.pwd}", :red
+          exit 1
+        end
+
         ensure!
         clean! if options["clean"]
         unless options["destructive"].nil?
@@ -61,7 +64,6 @@ module Librarian
           environment.config_db.local["path"] = options["path"]
         end
 
-        environment.config_db.local['use-v1-api'] = options['use-v1-api'] ? '1' : nil
         environment.config_db.local['mode'] = options['local'] ? 'local' : nil
 
         resolve!
@@ -85,14 +87,6 @@ module Librarian
       def version
         say "librarian-puppet v#{Librarian::Puppet::VERSION}"
       end
-
-      private
-
-      # override the actions to use our own
-
-      def install!(options = { })
-        Action::Install.new(environment, options).run
-      end
     end
   end
 end

data/lib/librarian/puppet/dsl.rb

@@ -17,14 +17,6 @@ module Librarian
       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 "http://forge.puppetlabs.com"
-            metadata
-          end
-        end
-
         Target.new(self).tap do |target|
           target.precache_sources(sources)
           debug_named_source_cache("Pre-Cached Sources", target)
@@ -38,49 +30,21 @@ module Librarian
       end
 
       class Receiver < Librarian::Dsl::Receiver
-        attr_reader :specfile, :working_path
+        attr_reader :specfile
 
         # save the specfile and call librarian
         def run(specfile = nil)
-          @working_path = specfile.kind_of?(Pathname) ? specfile.parent : Pathname.new(Dir.pwd)
           @specfile = specfile
           super
         end
 
         # implement the 'modulefile' syntax for Puppetfile
         def modulefile
-          f = modulefile_path
-          raise Error, "Modulefile file does not exist: #{f}" unless File.exists?(f)
-          File.read(f).lines.each do |line|
+          File.read(Pathname.new(specfile).parent.join('Modulefile')).lines.each do |line|
             regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
             regexp =~ line && mod($2, $4)
           end
         end
-
-        # implement the 'metadata' syntax for Puppetfile
-        def metadata
-          f = working_path.join('metadata.json')
-          unless File.exists?(f)
-            msg = "Metadata file does not exist: #{f}"
-            # try modulefile, in case we don't have a Puppetfile and we are using the default template
-            if File.exists?(modulefile_path)
-              modulefile
-              return
-            else
-              raise Error, msg
-            end
-          end
-          dependencyList = JSON.parse(File.read(f))['dependencies']
-          dependencyList.each do |d|
-            mod(d['name'], d['version_requirement'])
-          end
-        end
-
-        private
-
-        def modulefile_path
-          working_path.join('Modulefile')
-        end
       end
     end
   end

data/lib/librarian/puppet/environment.rb

@@ -46,9 +46,6 @@ module Librarian
         config_db['mode'] == 'local'
       end
 
-      def use_v1_api
-        config_db['use-v1-api']
-      end
     end
   end
 end

data/lib/librarian/puppet/extension.rb

@@ -8,22 +8,6 @@ module 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)
@@ -83,9 +67,23 @@ module Librarian
     end
   end
 
-  class ManifestSet
-    include Librarian::Puppet::Util
+  module Action
+    class Install < Base
 
+    private
+
+      def create_install_path
+        install_path.rmtree if install_path.exist? && destructive?
+        install_path.mkpath
+      end
+
+      def destructive?
+        environment.config_db.local['destructive'] == 'true'
+      end
+    end
+  end
+
+  class ManifestSet
     private
 
     # Check if module doesn't exist and fail fast
@@ -95,7 +93,7 @@ module Librarian
 
       deps = Set.new
       until names.empty?
-        name = normalize_name(names.shift)
+        name = names.shift
         next if deps.include?(name)
 
         deps << name
@@ -107,6 +105,7 @@ module Librarian
   end
 
   class Manifest
+
     class PreReleaseVersion
 
       # Compares pre-release component ids using Semver 2.0.0 spec

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

@@ -5,7 +5,6 @@ require 'librarian/manifest_set'
 module Librarian
   class Lockfile
     class Parser
-      include Librarian::Puppet::Util
 
       def parse(string)
         string = string.dup
@@ -27,8 +26,8 @@ module Librarian
           manifests = {}
           while lines.first =~ /^ {4}([\w\-\/]+) \((.*)\)$/ # This change allows forward slash
             lines.shift
-            name, version = normalize_name($1), $2
-            manifests[name] = {:version => version, :dependencies => {}}
+            name = $1
+            manifests[name] = {:version => $2, :dependencies => {}}
             while lines.first =~ /^ {6}([\w\-\/]+) \((.*)\)$/
               lines.shift
               manifests[name][:dependencies][$1] = $2.split(/,\s*/)
@@ -43,10 +42,9 @@ module Librarian
         dependencies = []
         while lines.first =~ /^ {2}([\w\-\/]+)(?: \((.*)\))?$/ # This change allows forward slash
           lines.shift
-          name, requirement = normalize_name($1), $2.split(/,\s*/)
+          name, requirement = $1, $2.split(/,\s*/)
           dependencies << Dependency.new(name, requirement, manifests_index[name].source)
         end
-
         Resolution.new(dependencies, manifests)
       end
 

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
@@ -53,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"
+            debug { "Replacing Puppet Forge API URL to use v3 #{uri}. You should update your Puppetfile" }
+          end
 
           @uri = URI::parse(uri)
           @cache_path = nil
@@ -121,7 +121,7 @@ module Librarian
         end
 
         def install_path(name)
-          environment.install_path.join(organization_name(name))
+          environment.install_path.join(name.split('/').last)
         end
 
         def fetch_version(name, version_uri)
@@ -148,14 +148,13 @@ module Librarian
 
         def repo(name)
           @repo ||= {}
-
           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$/
+              @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.rb

@@ -59,7 +59,7 @@ module Librarian
               install_path.rmtree
             end
 
-            unpacked_path = version_unpacked_cache_path(version).join(organization_name(name))
+            unpacked_path = version_unpacked_cache_path(version).join(name.split('/').last)
 
             unless unpacked_path.exist?
               raise Error, "#{unpacked_path} does not exist, something went wrong. Try removing it manually"
@@ -86,17 +86,9 @@ module Librarian
 
             target = vendored?(name, version) ? vendored_path(name, version).to_s : name
 
-            # can't pass the default v3 forge url (http://forgeapi.puppetlabs.com)
-            # to clients that use the v1 API (https://forge.puppetlabs.com)
-            # nor the other way around
+            # TODO can't pass the default v3 forge url (http://forgeapi.puppetlabs.com) to clients that use the v1 API (https://forge.puppetlabs.com)
             module_repository = source.to_s
-
-            if Forge.client_api_version() > 1 and module_repository =~ %r{^http(s)?://forge\.puppetlabs\.com}
-              module_repository = "https://forgeapi.puppetlabs.com"
-              warn { "Replacing Puppet Forge API URL to use v3 #{module_repository} as required by your client version #{Librarian::Puppet.puppet_version}" }
-            end
-
-            m = module_repository.match(%r{^http(s)?://forge(api)?\.puppetlabs\.com})
+            m = module_repository.match(%r{^http(s)?://forgeapi\.puppetlabs\.com})
             if Forge.client_api_version() == 1 and m
               ssl = m[1]
               # Puppet 2.7 can't handle the 302 returned by the https url, so stick to http

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

@@ -34,15 +34,11 @@ module Librarian
         private
 
           # 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?
@@ -57,13 +53,6 @@ module Librarian
                 end
               end
             end
-            # convert organization/modulename to organization-modulename
-            data.keys.each do |m|
-              if m =~ %r{.*/.*}
-                data[normalize_name(m)] = data[m]
-                data.delete(m)
-              end
-            end
             data
           end
 
@@ -90,7 +79,7 @@ module Librarian
           def api_call(module_name, version=nil)
             url = source.uri.clone
             url.path += "#{'/' if url.path.empty? or url.path[-1] != '/'}api/v1/releases.json"
-            url.query = "module=#{module_name.sub('-','/')}" # v1 API expects "organization/module"
+            url.query = "module=#{module_name}"
             url.query += "&version=#{version}" unless version.nil?
             debug { "Querying Forge API for module #{name}#{" and version #{version}" unless version.nil?}: #{url}" }
 

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

@@ -1,6 +1,7 @@
 require 'librarian/puppet/source/forge/repo'
 require 'puppet_forge'
-require 'librarian/puppet/version'
+
+PuppetForge.user_agent = "librarian-puppet/#{Librarian::Puppet::VERSION}"
 
 module Librarian
   module Puppet
@@ -8,8 +9,6 @@ module Librarian
       class Forge
         class RepoV3 < Librarian::Puppet::Source::Forge::Repo
 
-          PuppetForge.user_agent = "librarian-puppet/#{Librarian::Puppet::VERSION}"
-
           def get_versions
             get_module.releases.map{|r| r.version}
           end
@@ -25,7 +24,7 @@ module Librarian
             else
               # should never get here as we use one repo object for each module (to be changed in the future)
               debug { "Looking up url for #{name}@#{version}" }
-              release = PuppetForge::Release.find("#{name}-#{version}")
+              release = PuppetForge::Release.find("#{name.sub('/','-')}-#{version}")
             end
             "#{source}#{release.file_uri}"
           end
@@ -33,7 +32,7 @@ module Librarian
         private
 
           def get_module
-            @module ||= PuppetForge::Module.find(name)
+            @module ||= PuppetForge::Module.find(name.sub('/','-'))
             raise(Error, "Unable to find module '#{name}' on #{source}") unless @module
             @module
           end

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

@@ -98,7 +98,7 @@ module Librarian
         end
 
         def install_path(name)
-          environment.install_path.join(organization_name(name))
+          environment.install_path.join(name.split('/').last)
         end
 
         def fetch_version(name, version_uri)

data/lib/librarian/puppet/source/githubtarball/repo.rb

@@ -25,7 +25,7 @@ module Librarian
             all_versions = data.map { |r| r['name'].gsub(/^v/, '') }.sort.reverse
 
             all_versions.delete_if do |version|
-              version !~ /\A\d+\.\d+(\.\d+.*)?\z/
+              version !~ /\A\d\.\d(\.\d.*)?\z/
             end
 
             @versions = all_versions.compact
@@ -40,11 +40,11 @@ module Librarian
           end
 
           def install_version!(version, install_path)
-            if environment.local? && !vendored?(vendored_name, version)
+            if environment.local? && !vendored?(source.uri.to_s, version)
               raise Error, "Could not find a local copy of #{source.uri} at #{version}."
             end
 
-            vendor_cache(source.uri.to_s, version) unless vendored?(vendored_name, version)
+            vendor_cache(source.uri.to_s, version) unless vendored?(source.uri.to_s, version)
 
             cache_version_unpacked! version
 
@@ -62,19 +62,19 @@ module Librarian
 
             path.mkpath
 
-            target = vendored?(vendored_name, version) ? vendored_path(vendored_name, version) : name
+            target = vendored?(source.uri.to_s, version) ? vendored_path(source.uri.to_s, version) : name
 
             Librarian::Posix.run!(%W{tar xzf #{target} -C #{path}})
           end
 
           def vendor_cache(name, version)
-            clean_up_old_cached_versions(vendored_name(name))
+            clean_up_old_cached_versions(name)
 
             url = "https://api.github.com/repos/#{name}/tarball/#{version}"
-            add_api_token_to_url(url)
+            url << "?access_token=#{ENV['GITHUB_API_TOKEN']}" if ENV['GITHUB_API_TOKEN']
 
             environment.vendor!
-            File.open(vendored_path(vendored_name(name), version).to_s, 'wb') do |f|
+            File.open(vendored_path(name, version).to_s, 'wb') do |f|
               begin
                 debug { "Downloading <#{url}> to <#{f.path}>" }
                 open(url,
@@ -90,30 +90,11 @@ module Librarian
           end
 
           def clean_up_old_cached_versions(name)
-            Dir["#{environment.vendor_cache}/#{name}*.tar.gz"].each do |old_version|
+            Dir["#{environment.vendor_cache}/#{name.sub('/', '-')}*.tar.gz"].each do |old_version|
               FileUtils.rm old_version
             end
           end
 
-          def token_key_value
-            ENV[TOKEN_KEY]
-          end
-
-          def token_key_nil?
-            token_key_value.nil? || token_key_value.empty?
-          end
-
-          def add_api_token_to_url url
-            if token_key_nil?
-              debug { "#{TOKEN_KEY} environment value is empty or missing" }
-            elsif url.include? "?"
-              url << "&access_token=#{ENV[TOKEN_KEY]}"
-            else
-              url << "?access_token=#{ENV[TOKEN_KEY]}"
-            end
-            url
-          end
-
         private
 
           def api_call(path)
@@ -121,7 +102,7 @@ module Librarian
             url = "https://api.github.com#{path}?page=1&per_page=100"
             while true do
               debug { "  Module #{name} getting tags at: #{url}" }
-              add_api_token_to_url(url)
+              url << "&access_token=#{ENV[TOKEN_KEY]}" if ENV[TOKEN_KEY]
               response = http_get(url, :headers => {
                 "User-Agent" => "librarian-puppet v#{Librarian::Puppet::VERSION}"
               })
@@ -161,10 +142,6 @@ module Librarian
             options[:headers].each { |k, v| request.add_field k, v }
             http.request(request)
           end
-
-          def vendored_name(name = source.uri.to_s)
-            name.sub('/','-')
-          end
         end
       end
     end

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

@@ -1,5 +1,16 @@
 require 'librarian/puppet/util'
 
+begin
+  require 'puppet'
+  require 'puppet/module_tool'
+rescue LoadError
+  $stderr.puts <<-EOF
+Unable to load puppet, the puppet gem is required for :git and :path source.
+Install it with: gem install puppet
+  EOF
+  exit 1
+end
+
 module Librarian
   module Puppet
     module Source
@@ -15,11 +26,11 @@ module Librarian
           found_path = found_path(name)
           raise Error, "Path for #{name} doesn't contain a puppet module" if found_path.nil?
 
-          unless name.include? '/' or name.include? '-'
-            warn { "Invalid module name '#{name}', you should qualify it with 'ORGANIZATION-#{name}' for resolution to work correctly" }
+          unless name.include? '/'
+            warn { "Invalid module name '#{name}', you should qualify it with 'ORGANIZATION/#{name}' for resolution to work correctly" }
           end
 
-          install_path = environment.install_path.join(organization_name(name))
+          install_path = environment.install_path.join(name.split('/').last)
           if install_path.exist?
             debug { "Deleting #{relative_path_to(install_path)}" }
             install_path.rmtree
@@ -37,60 +48,39 @@ module Librarian
         def fetch_dependencies(name, version, extra)
           dependencies = Set.new
 
+          if modulefile?
+            evaluate_modulefile(modulefile).dependencies.each do |dependency|
+              dependency_name = dependency.instance_variable_get(:@full_module_name)
+              version = dependency.instance_variable_get(:@version_requirement)
+              gem_requirement = Requirement.new(version).gem_requirement
+              dependencies << Dependency.new(dependency_name, gem_requirement, forge_source)
+            end
+          end
+
           if specfile?
             spec = environment.dsl(Pathname(specfile))
             dependencies.merge spec.dependencies
           end
 
-          parsed_metadata['dependencies'].each do |d|
-            gem_requirement = Requirement.new(d['version_requirement']).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
-          end
-
           dependencies
         end
 
         def forge_source
-          Forge.from_lock_options(environment, :remote => "https://forge.puppetlabs.com")
+          Forge.from_lock_options(environment, :remote=>"http://forge.puppetlabs.com")
         end
 
         private
 
         # Naming this method 'version' causes an exception to be raised.
         def module_version
-          if parsed_metadata['version']
-            parsed_metadata['version']
-          else
-            warn { "Module #{to_s} does not have version, defaulting to 0.0.1" }
-            '0.0.1'
-          end
-        end
-
-        def require_puppet
-          begin
-            require 'puppet'
-            require 'puppet/module_tool'
-          rescue LoadError
-            $stderr.puts <<-EOF
-          Unable to load puppet, the puppet gem is required for :git and :path source.
-          Install it with: gem install puppet
-            EOF
-            exit 1
-          end
-          true
+          return '0.0.1' unless modulefile?
+          evaluate_modulefile(modulefile).version
         end
 
         def evaluate_modulefile(modulefile)
-          @@require_puppet ||= require_puppet
-
           metadata = ::Puppet::ModuleTool::Metadata.new
           begin
             ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-            raise SyntaxError, "Missing version" unless metadata.version
           rescue ArgumentError, SyntaxError => error
             warn { "Unable to parse #{modulefile}, ignoring: #{error}" }
             if metadata.respond_to? :version=
@@ -102,29 +92,6 @@ module Librarian
           metadata
         end
 
-        def parsed_metadata
-          @metadata ||= if metadata?
-            JSON.parse(File.read(metadata))
-          elsif modulefile?
-            # translate Modulefile to metadata.json
-            evaluated = evaluate_modulefile(modulefile)
-            {
-              'version' => evaluated.version,
-              'dependencies' => evaluated.dependencies.map do |dependency|
-                {
-                  'name' => dependency.instance_variable_get(:@full_module_name),
-                  'version_requirement' => dependency.instance_variable_get(:@version_requirement)
-                }
-              end
-            }
-          else
-            {
-              'dependencies' => []
-            }
-          end
-          @metadata
-        end
-
         def modulefile
           File.join(filesystem_path, 'Modulefile')
         end
@@ -133,14 +100,6 @@ module Librarian
           File.exists?(modulefile)
         end
 
-        def metadata
-          File.join(filesystem_path, 'metadata.json')
-        end
-
-        def metadata?
-          File.exists?(metadata)
-        end
-
         def specfile
           File.join(filesystem_path, environment.specfile_name)
         end

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

@@ -29,7 +29,7 @@ module Librarian
         end
 
         def vendored_path(name, version)
-          environment.vendor_cache.join("#{name}-#{version}.tar.gz")
+          environment.vendor_cache.join("#{name.sub("/", "-")}-#{version}.tar.gz")
         end
 
       end

data/lib/librarian/puppet/templates/Puppetfile

@@ -1,25 +1,16 @@
 #!/usr/bin/env ruby
 #^syntax detection
 
-forge "https://forgeapi.puppetlabs.com"
-
-# use dependencies defined in metadata.json
-metadata
+forge "http://forge.puppetlabs.com"
 
 # use dependencies defined in Modulefile
-# modulefile
+modulefile
 
-# A module from the Puppet Forge
-# mod 'puppetlabs-stdlib'
+# mod 'puppetlabs/stdlib'
 
-# A module from git
-# mod 'puppetlabs-ntp',
+# mod 'ntp',
 #   :git => 'git://github.com/puppetlabs/puppetlabs-ntp.git'
 
-# A module from a git branch/tag
-# mod 'puppetlabs-apt',
+# mod 'apt',
 #   :git => 'https://github.com/puppetlabs/puppetlabs-apt.git',
-#   :ref => '1.4.x'
-
-# A module from Github pre-packaged tarball
-# mod 'puppetlabs-apache', '0.6.0', :github_tarball => 'puppetlabs/puppetlabs-apache'
+#   :ref => 'feature/master/dans_refactor'

data/lib/librarian/puppet/util.rb

@@ -33,16 +33,6 @@ module Librarian
         new_uri.password = nil
         new_uri
       end
-
-      # normalize module name to use organization-module instead of organization/module
-      def normalize_name(name)
-        name.sub('/','-')
-      end
-
-      # get the organization name from organization-module
-      def organization_name(name)
-        name.split('-',2).last
-      end
     end
   end
 end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.0.9"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Tim Sharpe
-- Carlos Sanchez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -25,6 +24,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  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: json
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +156,6 @@ description: |-
     a single command.
 email:
 - tim@sharpe.id.au
-- carlos@apache.org
 executables:
 - librarian-puppet
 extensions: []
@@ -154,8 +166,6 @@ files:
 - README.md
 - bin/librarian-puppet
 - lib/librarian/puppet.rb
-- lib/librarian/puppet/action.rb
-- lib/librarian/puppet/action/install.rb
 - lib/librarian/puppet/cli.rb
 - lib/librarian/puppet/dsl.rb
 - lib/librarian/puppet/environment.rb

data/lib/librarian/puppet/action.rb

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

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

@@ -1,24 +0,0 @@
-module Librarian
-  module Puppet
-    module Action
-      class Install < Librarian::Action::Install
-
-        private
-
-        def create_install_path
-          install_path.rmtree if install_path.exist? && destructive?
-          install_path.mkpath
-        end
-
-        def destructive?
-          environment.config_db.local['destructive'] == 'true'
-        end
-
-        def check_specfile
-          # don't fail if Puppetfile doesn't exist as we'll use the Modulefile or metadata.json
-        end
-
-      end
-    end
-  end
-end