librarian-puppet 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65da3b51c58c415edbe7148801d7eccd40232fb1
-  data.tar.gz: fa243fef1a099850e0620c79f814561822735b6c
+  metadata.gz: 9e38c81fc33fcc4e0223be2ce7f705a93f3f0896
+  data.tar.gz: e48f55419ffc8e6fd2df107c08111c35f0c679fa
 SHA512:
-  metadata.gz: 719f6605dc5ceb95ea7917683f2cf833a96ab39d0b1ba6ebd61b96c597d718dd56306497d0bc5bb973dfd6fcf706a59fdf26d70fb361efe5d6236405e277bdb4
-  data.tar.gz: ff64b0efd0c19766d77f27799a900dbc2e5920e15541d3f8d640b6d2d4cc32a1406a3aa21b6be29f4d013a69cc69ba4b8f0ac5a804f2f5798670b729eb7aa07d
+  metadata.gz: e9f5ade15b27c5a35eb7ada03313f1da390cc5854d1abfe184041640192bcfcd2e6601b4bdf2cfe21ae65eda5bd912a6bf0286c1c1bd1414e5c364b9b673359d
+  data.tar.gz: 2054b93a68ce5f4a9e64c7bf02a057ce274250737528f97ccaa39c4058dad3828c7c7e59bebea6dc8d3d0dd82a75dbcd0640cf6c3d19201a12031e3bb12003f7

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
+* 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
@@ -70,7 +70,7 @@ This Puppetfile will download all the dependencies listed in your Modulefile fro
 ### Recursive module dependency resolution
 
 When fetching a module all dependencies specified in its
-`Modulefile` and `Puppetfile` will be resolved and installed.
+`Modulefile`, `metadata.json` and `Puppetfile` will be resolved and installed.
 
 ### Puppetfile Breakdown
 

data/lib/librarian/puppet/dsl.rb

@@ -45,6 +45,14 @@ module Librarian
             regexp =~ line && mod($2, $4)
           end
         end
+
+        # implement the 'metadata' syntax for Puppetfile
+        def metadata
+          dependencyList = JSON.parse(File.read(Pathname.new(specfile).parent.join('metadata.json')))['dependencies']
+          dependencyList.each do |d|
+            mod(d['name'], d['version_requirement'])
+          end
+        end
       end
     end
   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(organization_name(name))
         end
 
         def fetch_version(name, version_uri)

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(organization_name(name))
 
             unless unpacked_path.exist?
               raise Error, "#{unpacked_path} does not exist, something went wrong. Try removing it manually"

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(organization_name(name))
         end
 
         def fetch_version(name, version_uri)

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

@@ -1,16 +1,5 @@
 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
@@ -30,7 +19,7 @@ module Librarian
             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(organization_name(name))
           if install_path.exist?
             debug { "Deleting #{relative_path_to(install_path)}" }
             install_path.rmtree
@@ -48,13 +37,21 @@ 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)
+          dependencyList = if metadata?
+            JSON.parse(File.read(metadata))['dependencies']
+          elsif modulefile?
+            evaluate_modulefile(modulefile).dependencies.map do |dependency|
+              {
+                'name' => dependency.instance_variable_get(:@full_module_name),
+                'version_requirement' => dependency.instance_variable_get(:@version_requirement)
+              }
             end
+          else []
+          end
+
+          dependencyList.each do |d|
+            gem_requirement = Requirement.new(d['version_requirement']).gem_requirement
+            dependencies << Dependency.new(d['name'], gem_requirement, forge_source)
           end
 
           if specfile?
@@ -77,7 +74,23 @@ module Librarian
           evaluate_modulefile(modulefile).version
         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
+        end
+
         def evaluate_modulefile(modulefile)
+          @@require_puppet ||= require_puppet
+
           metadata = ::Puppet::ModuleTool::Metadata.new
           begin
             ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
@@ -100,6 +113,14 @@ 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/templates/Puppetfile

@@ -3,8 +3,11 @@
 
 forge "https://forgeapi.puppetlabs.com"
 
+# use dependencies defined in metadata.json
+metadata
+
 # use dependencies defined in Modulefile
-modulefile
+# modulefile
 
 # A module from the Puppet Forge
 # mod 'puppetlabs-stdlib'

data/lib/librarian/puppet/util.rb

@@ -38,6 +38,11 @@ module Librarian
       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.1.3"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Tim Sharpe
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-22 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian