librarian-puppet 0.9.13 → 0.9.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjAxMzZlZmJiNDdiMDAyMGNhNjMwOGNmOWZjNDYzN2ExYWJkZDE3Zg==
+    YTJiNjNkOTc5NTIwMzIyMjc4ZTk4ZjYxNDU1OTk1YWU0Zjk2YmZmOA==
   data.tar.gz: !binary |-
-    ZTlkNjMwYTkwMjQ5ZjE1ZGE4MTU5OWYxMmJjNDIyMTY1NzhkYjU3Mg==
+    M2U0MmZhMWMyZTUyYzJjMDNmOGFlOTUxZTI5OGI1NjQzOGYwNzk1MA==
 SHA512:
   metadata.gz: !binary |-
-    MDE4N2ZkMWQ4YjhkZGQwNWFjYTI4ZjUyMjNkMDcyMDZjMjQ1OTEyZGE3N2Uw
-    ZTFlMGRmYTg4Y2RlNWE4NmUwOGZkZjVmOWU3MTYzMGIzMjgzNDcyMzk1NzE0
-    MmIxM2RjZjUzNGMxYWRlZjAwZjUzOGU4NDQyOWQ2NDgxMDEzZDg=
+    M2VhNTk1MzliMzU5YzliNmQ4YWJjY2Y2YTc4ZDUyMjBhZjU3ZWE2ODY4MDVl
+    YmRmZDBiNjNmNzdkNDQ2ODk4MmZmMWIwMDVkNWE5YWIyOTAxZjE0YTU2ODY5
+    YWQ5YWNlOGQ1MGY2OTUzZjliODEyMDI4ZjAxOTRkMjJlOTc4Zjg=
   data.tar.gz: !binary |-
-    NWU5OWM0MmNmYTc3ZjhhODk4NTgxMjQ3NzFkN2E2ZDY4MTNkZGUxYjljOTRj
-    NDNjMTg0MDIxMDg3ZjI4MDY2MjM3MTFjNTg3ZmZjNDljZWUzZDMxYzE2MDIx
-    YmJlNDUyMDM2YWQ1M2MzYzcwOWIwODE3NTgwMDNkOTRmZjI4NWI=
+    MjAyNmJkM2Q3ODczMzBiYWFhODQzZmY2NDdjM2E4NDViZjgwMTcwZGZhMmEx
+    MDJhYjcxOTYyODc5YmUwYjliYjIyNGZjMzViYzljZGY0Y2ZjOTljOWZjNDAw
+    YWJjMDEwOWUwY2JkODQ3ODAwMzJjZDBlNTIyZDFkMzNhOGJmMjE=

data/lib/librarian/puppet.rb

@@ -5,14 +5,27 @@ require 'open3_backport' if RUBY_VERSION < '1.9'
 
 status = nil
 out = nil
+err = nil
 error = nil
 
 begin
-  Open3.popen3('puppet --version') {|stdin, stdout, stderr, wait_thr|
-    pid = wait_thr.pid # pid of the started process.
-    out = stdout.read
-    status = wait_thr.value # Process::Status object returned.
-  }
+  if RUBY_VERSION < '1.9'
+    # Ruby 1.8.x backport of popen3 doesn't allow the 'env' hash argument
+    # Not sanitizing the environment for the moment.
+    Open3.popen3('puppet --version') {|stdin, stdout, stderr, wait_thr|
+      pid = wait_thr.pid # pid of the started process.
+      out = stdout.read
+      err = stderr.read
+      status = wait_thr.value # Process::Status object returned.
+    }
+  else
+    Open3.popen3({"GEM_PATH"=> nil},'puppet --version') {|stdin, stdout, stderr, wait_thr|
+      pid = wait_thr.pid # pid of the started process.
+      out = stdout.read
+      err = stderr.read
+      status = wait_thr.value # Process::Status object returned.
+    }
+  end
 rescue => e
   error = e
 end
@@ -22,6 +35,7 @@ if status.nil? or status.exitstatus != 0
 Unable to load puppet. Please install it using native packages for your platform (eg .deb, .rpm, .dmg, etc).
 #{out.nil? or out.empty? ? "puppet --version returned #{status.exitstatus}" : out}
 #{error.message unless error.nil?}
+#{err unless err.nil?}
 EOF
   exit 1
 end

data/lib/librarian/puppet/dsl.rb

@@ -1,4 +1,5 @@
 require 'librarian/dsl'
+require 'librarian/dsl/target'
 require 'librarian/puppet/source'
 
 module Librarian
@@ -11,17 +12,38 @@ module Librarian
       source :git => Source::Git
       source :path => Source::Path
       source :github_tarball => Source::GitHubTarball
-    end
-  end
-end
 
-module Librarian
-  class Dsl
-    class Receiver
-      def modulefile
-        File.read('Modulefile').lines.each do |line|
-          regexp = /\s*dependency\s+('|")([^'"]+)\1\s*(?:,\s*('|")([^'"]+)\3)?/
-          regexp =~ line && mod($2, $4)
+      # 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?
+
+        Target.new(self).tap do |target|
+          target.precache_sources(sources)
+          debug_named_source_cache("Pre-Cached Sources", target)
+
+          specfile ||= Proc.new if block_given?
+          receiver = Receiver.new(target)
+          receiver.run(specfile)
+
+          debug_named_source_cache("Post-Cached Sources", target)
+        end.to_spec
+      end
+
+      class Receiver < Librarian::Dsl::Receiver
+        attr_reader :specfile
+
+        # save the specfile and call librarian
+        def run(specfile = nil)
+          @specfile = specfile
+          super
+        end
+
+        # implement the 'modulefile' syntax for Puppetfile
+        def modulefile
+          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
       end
     end

data/lib/librarian/puppet/extension.rb

@@ -218,4 +218,11 @@ module Librarian
     end
   end
 
+  class Logger
+    def warn(string = nil, &block)
+      return unless ui
+
+      ui.warn(string || yield)
+    end
+  end
 end

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

@@ -1,15 +1,5 @@
 require 'librarian/source/git'
 require 'librarian/puppet/source/local'
-begin
-  require 'puppet'
-rescue LoadError
-  $stderr.puts <<-EOF
-Unable to load puppet, the puppet gem is required for :git source.
-Install it with: gem install puppet
-EOF
-  exit 1
-end
-
 
 module Librarian
   module Source
@@ -71,68 +61,6 @@ module Librarian
           end
         end
 
-        def fetch_version(name, extra)
-          cache!
-          found_path = found_path(name)
-          module_version
-        end
-
-        def fetch_dependencies(name, version, extra)
-          dependencies = Set.new
-
-          if modulefile?
-            metadata = ::Puppet::ModuleTool::Metadata.new
-
-            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-            metadata.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
-
-          dependencies
-        end
-
-        def forge_source
-          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
-          return '0.0.1' unless modulefile?
-
-          metadata  = ::Puppet::ModuleTool::Metadata.new
-          ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
-
-          metadata.version
-        end
-
-        def modulefile
-          File.join(filesystem_path, 'Modulefile')
-        end
-
-        def modulefile?
-          File.exists?(modulefile)
-        end
-
-        def specfile
-          File.join(filesystem_path, environment.specfile_name)
-        end
-
-        def specfile?
-          File.exists?(specfile)
-        end
-
       end
     end
   end

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

@@ -1,3 +1,13 @@
+begin
+  require 'puppet'
+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
@@ -31,14 +41,67 @@ module Librarian
         def fetch_version(name, extra)
           cache!
           found_path = found_path(name)
-          '0.0.1'
+          module_version
         end
 
         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
+
+          dependencies
+        end
+
+        def forge_source
+          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
+          return '0.0.1' unless modulefile?
+          evaluate_modulefile(modulefile).version
+        end
+
+        def evaluate_modulefile(modulefile)
+          metadata = ::Puppet::ModuleTool::Metadata.new
+          begin
+            ::Puppet::ModuleTool::ModulefileReader.evaluate(metadata, modulefile)
+          rescue ArgumentError, SyntaxError => error
+            warn { "Unable to parse #{modulefile}, ignoring: #{error}" }
+            metadata.version = '0.0.1'
+          end
+          metadata
+        end
+
+        def modulefile
+          File.join(filesystem_path, 'Modulefile')
         end
 
-      private
+        def modulefile?
+          File.exists?(modulefile)
+        end
+
+        def specfile
+          File.join(filesystem_path, environment.specfile_name)
+        end
+
+        def specfile?
+          File.exists?(specfile)
+        end
 
         def install_perform_step_copy!(found_path, install_path)
           debug { "Copying #{relative_path_to(found_path)} to #{relative_path_to(install_path)}" }

data/lib/librarian/puppet/util.rb

@@ -9,6 +9,9 @@ module Librarian
       def info(*args, &block)
         environment.logger.info(*args, &block)
       end
+      def warn(*args, &block)
+        environment.logger.warn(*args, &block)
+      end
 
       # workaround Issue #173 FileUtils.cp_r will fail if there is a symlink that points to a missing file
       # or when the symlink is copied before the target file when preserve is true

data/lib/librarian/puppet/version.rb

@@ -1,5 +1,5 @@
 module Librarian
   module Puppet
-    VERSION = "0.9.13"
+    VERSION = "0.9.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librarian-puppet
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - Tim Sharpe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: librarian