librarian-puppet 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b51ee7e9d024d0df081d224ba54a12e4a06dde25
-  data.tar.gz: ef88d4c028b403d861dbb3a7e5ee2d8f53593095
+  metadata.gz: 65da3b51c58c415edbe7148801d7eccd40232fb1
+  data.tar.gz: fa243fef1a099850e0620c79f814561822735b6c
 SHA512:
-  metadata.gz: eeecb236adf9ef6285069e01655e0d559fd63cbebe1a8c8464f610982307a5b1b7a48a94e786f5435cf8eedd719a0837cc1ec25f80a59151883558452abc4794
-  data.tar.gz: c4df7ac66216eb589a12302718a5f9ac7e3aaf1ec21ebb8baff472a1d5eea8fea91208b823d8e192ef893b4cb6b6efd8084a652eb26a3051b97a0377a0d35279
+  metadata.gz: 719f6605dc5ceb95ea7917683f2cf833a96ab39d0b1ba6ebd61b96c597d718dd56306497d0bc5bb973dfd6fcf706a59fdf26d70fb361efe5d6236405e277bdb4
+  data.tar.gz: ff64b0efd0c19766d77f27799a900dbc2e5920e15541d3f8d640b6d2d4cc32a1406a3aa21b6be29f4d013a69cc69ba4b8f0ac5a804f2f5798670b729eb7aa07d

data/README.md

@@ -28,6 +28,13 @@ 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 will have a file named
@@ -47,16 +54,16 @@ This Puppetfile will download all the dependencies listed in your Modulefile fro
 
     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'
 
 
@@ -73,29 +80,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'
 
@@ -117,7 +124,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"
 
@@ -154,6 +161,14 @@ 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

@@ -44,6 +44,7 @@ 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')
@@ -64,6 +65,7 @@ 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!

data/lib/librarian/puppet/environment.rb

@@ -46,6 +46,9 @@ 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,6 +8,19 @@ module Librarian
   end
 
   class Dependency
+    include Librarian::Puppet::Util
+
+    def initialize(name, requirement, source)
+      assert_name_valid! name
+
+      # 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)
@@ -84,6 +97,8 @@ module Librarian
   end
 
   class ManifestSet
+    include Librarian::Puppet::Util
+
     private
 
     # Check if module doesn't exist and fail fast
@@ -93,7 +108,7 @@ module Librarian
 
       deps = Set.new
       until names.empty?
-        name = names.shift
+        name = normalize_name(names.shift)
         next if deps.include?(name)
 
         deps << name
@@ -105,7 +120,6 @@ 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,6 +5,7 @@ require 'librarian/manifest_set'
 module Librarian
   class Lockfile
     class Parser
+      include Librarian::Puppet::Util
 
       def parse(string)
         string = string.dup
@@ -26,8 +27,8 @@ module Librarian
           manifests = {}
           while lines.first =~ /^ {4}([\w\-\/]+) \((.*)\)$/ # This change allows forward slash
             lines.shift
-            name = $1
-            manifests[name] = {:version => $2, :dependencies => {}}
+            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*/)
@@ -42,9 +43,10 @@ module Librarian
         dependencies = []
         while lines.first =~ /^ {2}([\w\-\/]+)(?: \((.*)\))?$/ # This change allows forward slash
           lines.shift
-          name, requirement = $1, $2.split(/,\s*/)
+          name, requirement = normalize_name($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/repo.rb

@@ -59,7 +59,7 @@ module Librarian
               install_path.rmtree
             end
 
-            unpacked_path = version_unpacked_cache_path(version).join(name.split('/').last)
+            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"

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

@@ -34,11 +34,15 @@ 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?
@@ -53,6 +57,13 @@ 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
 
@@ -79,7 +90,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}"
+            url.query = "module=#{module_name.sub('-','/')}" # v1 API expects "organization/module"
             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

@@ -25,7 +25,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.sub('/','-')}-#{version}")
+              release = PuppetForge::Release.find("#{name}-#{version}")
             end
             "#{source}#{release.file_uri}"
           end
@@ -33,7 +33,7 @@ module Librarian
         private
 
           def get_module
-            @module ||= PuppetForge::Module.find(name.sub('/','-'))
+            @module ||= PuppetForge::Module.find(name)
             raise(Error, "Unable to find module '#{name}' on #{source}") unless @module
             @module
           end

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

@@ -121,7 +121,7 @@ module Librarian
         end
 
         def install_path(name)
-          environment.install_path.join(name.split('/').last)
+          environment.install_path.join(name.split('-').last)
         end
 
         def fetch_version(name, version_uri)
@@ -148,9 +148,10 @@ 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$/
+            if uri.hostname =~ /\.puppetlabs\.com$/ || !environment.use_v1_api
               @repo[name] = RepoV3.new(self, name)
             else
               @repo[name] = RepoV1.new(self, name)

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

@@ -40,11 +40,11 @@ module Librarian
           end
 
           def install_version!(version, install_path)
-            if environment.local? && !vendored?(source.uri.to_s, version)
+            if environment.local? && !vendored?(vendored_name, version)
               raise Error, "Could not find a local copy of #{source.uri} at #{version}."
             end
 
-            vendor_cache(source.uri.to_s, version) unless vendored?(source.uri.to_s, version)
+            vendor_cache(source.uri.to_s, version) unless vendored?(vendored_name, version)
 
             cache_version_unpacked! version
 
@@ -62,19 +62,19 @@ module Librarian
 
             path.mkpath
 
-            target = vendored?(source.uri.to_s, version) ? vendored_path(source.uri.to_s, version) : name
+            target = vendored?(vendored_name, version) ? vendored_path(vendored_name, version) : name
 
             Librarian::Posix.run!(%W{tar xzf #{target} -C #{path}})
           end
 
           def vendor_cache(name, version)
-            clean_up_old_cached_versions(name)
+            clean_up_old_cached_versions(vendored_name(name))
 
             url = "https://api.github.com/repos/#{name}/tarball/#{version}"
             add_api_token_to_url(url)
 
             environment.vendor!
-            File.open(vendored_path(name, version).to_s, 'wb') do |f|
+            File.open(vendored_path(vendored_name(name), version).to_s, 'wb') do |f|
               begin
                 debug { "Downloading <#{url}> to <#{f.path}>" }
                 open(url,
@@ -90,7 +90,7 @@ module Librarian
           end
 
           def clean_up_old_cached_versions(name)
-            Dir["#{environment.vendor_cache}/#{name.sub('/', '-')}*.tar.gz"].each do |old_version|
+            Dir["#{environment.vendor_cache}/#{name}*.tar.gz"].each do |old_version|
               FileUtils.rm old_version
             end
           end
@@ -106,6 +106,8 @@ module Librarian
           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
@@ -159,6 +161,10 @@ 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/githubtarball.rb

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

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

@@ -26,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? '/'
-            warn { "Invalid module name '#{name}', you should qualify it with 'ORGANIZATION/#{name}' for resolution to work correctly" }
+          unless name.include? '/' or 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(name.split('/').last)
+          install_path = environment.install_path.join(name.split('-').last)
           if install_path.exist?
             debug { "Deleting #{relative_path_to(install_path)}" }
             install_path.rmtree

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

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

data/lib/librarian/puppet/templates/Puppetfile

@@ -7,16 +7,16 @@ forge "https://forgeapi.puppetlabs.com"
 modulefile
 
 # A module from the Puppet Forge
-# mod 'puppetlabs/stdlib'
+# mod 'puppetlabs-stdlib'
 
 # A module from git
-# mod 'puppetlabs/ntp',
+# mod 'puppetlabs-ntp',
 #   :git => 'git://github.com/puppetlabs/puppetlabs-ntp.git'
 
 # A module from a git branch/tag
-# mod 'puppetlabs/apt',
+# mod 'puppetlabs-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'
+# mod 'puppetlabs-apache', '0.6.0', :github_tarball => 'puppetlabs/puppetlabs-apache'

data/lib/librarian/puppet/util.rb

@@ -33,6 +33,11 @@ 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
     end
   end
 end

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "1.1.2"
+    VERSION = "1.1.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian
@@ -39,20 +39,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: json
-  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
@@ -200,7 +186,7 @@ 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:
   - - '>='